Integrate the new icons

Install and use the node-editor and print-editor icons.

diff --git a/demos/node-editor/meson.build b/demos/node-editor/meson.build
index d09b4bd7a5fa92c5d7ba9c8d0483ccf89155d9d9..b8513fb223ebafbb96f022621512bf5a087f02a4 100644 (file)
--- a/demos/node-editor/meson.build
+++ b/demos/node-editor/meson.build
@@ -19,3 +19,12 @@ executable('gtk4-node-editor',
            gui_app: true,
            link_args: extra_demo_ldflags,
            install: false)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach

diff --git a/demos/node-editor/node-editor-application.c b/demos/node-editor/node-editor-application.c
index 84561ec73c2a669c50b0c8bbad45d9df45b826e2..abc8dea47b6f30c1fcfecf95a21ecd5dbdd39f98 100644 (file)
--- a/demos/node-editor/node-editor-application.c
+++ b/demos/node-editor/node-editor-application.c
@@ -101,7 +101,7 @@ activate_about (GSimpleAction *action,
                          "website", "http://www.gtk.org",
                          "comments", "Program to test GTK rendering",
                          "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL},
-                         "logo-icon-name", "org.gtk.gtk4.NodeEditor",
+                         "logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel",
                          "title", "About GTK Node Editor",
                          "system-information", s->str,
                          NULL);

diff --git a/demos/print-editor/meson.build b/demos/print-editor/meson.build
index 9b3e7910c557be630d5c2d812751a51912ca3b17..15b12d57e33822bd694dee6ef2141d6be22e1b34 100644 (file)
--- a/demos/print-editor/meson.build
+++ b/demos/print-editor/meson.build
@@ -12,3 +12,12 @@ install_data('org.gtk.PrintEditor4.desktop', install_dir: gtk_applicationsdir)
 
 # appdata
 install_data('org.gtk.PrintEditor4.appdata.xml', install_dir: gtk_appdatadir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach

diff --git a/demos/print-editor/org.gtk.PrintEditor4.desktop b/demos/print-editor/org.gtk.PrintEditor4.desktop
index 7c663365d3d086a71b7d80c0a8bc3ac40878bc88..87f5799e9b8b36f8c55287e577fe06d798e3dee7 100644 (file)
--- a/demos/print-editor/org.gtk.PrintEditor4.desktop
+++ b/demos/print-editor/org.gtk.PrintEditor4.desktop
@@ -2,7 +2,7 @@
 Name=Print Editor
 Comment=A simple editor demonstrating GTK printing
 Exec=gtk4-print-editor %f
-Icon=text-editor-symbolic
+Icon=org.gtk.PrintEditor4.Devel
 Terminal=false
 Type=Application
 StartupNotify=true

diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c
index 641a1f7cac37c22705e2fb2e0bef373c43490750..e6353fa05468f5955593ce1a6739cfe627ada9e2 100644 (file)
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -633,7 +633,7 @@ activate_about (GSimpleAction *action,
                          "website", "http://www.gtk.org",
                          "comments", "Program to demonstrate GTK printing",
                          "authors", (const char *[]){ "Alexander Larsson", NULL },
-                         "logo-icon-name", "org.gtk.PrintEditor4",
+                         "logo-icon-name", "org.gtk.PrintEditor4.Devel",
                          "title", "About GTK Print Editor",
                          "system-information", sysinfo->str,
                          NULL);